Add -fno-optimize-sibling-calls to debug CFLAGS. Also get rid of ?=

assignment to CFLAGS.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 82a99d3f111982ab5883f93aa7eaad009ba86e45..c020357654174415c193b139a7d6d9a8a4066ecf 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -41,9 +41,8 @@ SONAME_LDFLAG = -soname
 SHLIB_CFLAGS = -shared
 
 ifneq ($(debug),y)
-# Optimisation flags are overridable
-CFLAGS ?= -O2 -fomit-frame-pointer
+CFLAGS += -O2 -fomit-frame-pointer
 else
 # Less than -O1 produces bad code and large stack frames
-CFLAGS ?= -O1 -fno-omit-frame-pointer
+CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls
 endif

diff --git a/config/SunOS.mk b/config/SunOS.mk
index c2a5594000ba246023a0200dcb9d6075ae8b6c84..61fa489c27a6f0ee37e11a85cd538bac16bf8cca 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -45,11 +45,10 @@ SONAME_LDFLAG = -h
 SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
 
 ifneq ($(debug),y)
-# Optimisation flags are overridable
-CFLAGS ?= -O2 -fno-omit-frame-pointer
+CFLAGS += -O2 -fno-omit-frame-pointer
 else
 # Less than -O1 produces bad code and large stack frames
-CFLAGS ?= -O1 -fno-omit-frame-pointer
+CFLAGS += -O1 -fno-omit-frame-pointer
 endif
 
 CFLAGS += -Wa,--divide -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__